Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Sep 2011 14:57:03 +0000 (07:57 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Sep 2011 14:57:03 +0000 (07:57 -0700)
commit06bf1b94b12c5a2e3f53211c1c9f4a9d4a40291e
tree45bb1153add9b9df2fce1624c320388707da5f3a
parenta6c1e3249cde040a1baebe178bdd07d09a6ac876
parent118de803e560e8db3ccdfe01542045dad3ffb456
Merge from trunk.